A general comment: does it make sense to merge this PR where Zone and ZoneInfo are separate objects and then add a new one to merge them? I would prefer this to be done in one single PR if there are no strong arguments against.

Regarding the general comment, we had discussed it here before doing this. You are correct that it is in part redundant and we will be taking a step back by refactoring later, but it is in fact my preferred way. By taking this detour, I am getting a much better grasp of the library architecture, internals and style, which helps me a lot (I am still a newbie here). Plus, I am already almost done. Unless you feel really strongly about it, I still prefer to merge this PR and then refactor.